From b945dd3342a63e3fd8174c57a5ee327f9c8fa492 Mon Sep 17 00:00:00 2001 From: "stekloff@elm3b216.beaverton.ibm.com" Date: Wed, 14 Dec 2005 11:59:19 +0000 Subject: [PATCH] Adding SKIP() to tests that aren't supported for VMX domains. Signed-off-by: Dan Stekloff --- .../tests/block-create/01_block_attach_device_pos.py | 2 ++ .../tests/block-create/02_block_attach_file_device_pos.py | 2 ++ .../block-create/04_block_attach_device_repeatedly_pos.py | 2 ++ .../05_block_attach_and_dettach_device_repeatedly_pos.py | 2 ++ .../tests/block-create/06_block_attach_baddomain_neg.py | 3 +++ .../tests/block-create/07_block_attach_baddevice_neg.py | 2 ++ .../block-create/08_block_attach_bad_filedevice_neg.py | 2 ++ .../09_block_attach_and_dettach_device_check_data_pos.py | 2 ++ .../10_block_attach_dettach_multiple_devices.py | 3 +++ .../tests/block-create/11_block_attach_shared_dom0.py | 3 +++ .../tests/block-create/12_block_attach_shared_domU.py | 3 +++ .../tests/block-destroy/01_block-destroy_btblock_pos.py | 3 +++ .../tests/block-destroy/02_block-destroy_rtblock_pos.py | 3 +++ .../tests/block-destroy/04_block-destroy_nonattached_neg.py | 3 +++ .../tests/block-destroy/05_block-destroy_byname_pos.py | 3 +++ .../tests/block-destroy/06_block-destroy_check_list_pos.py | 3 +++ tools/xm-test/tests/block-list/01_block-list_pos.py | 3 +++ .../xm-test/tests/block-list/02_block-list_attachbd_pos.py | 3 +++ .../xm-test/tests/block-list/03_block-list_anotherbd_pos.py | 3 +++ tools/xm-test/tests/block-list/04_block-list_nodb_pos.py | 6 +++--- .../tests/block-list/06_block-list_checkremove_pos.py | 3 +++ tools/xm-test/tests/memmax/01_memmax_badparm_neg.py | 2 ++ tools/xm-test/tests/memset/01_memset_basic_pos.py | 3 +++ tools/xm-test/tests/memset/02_memset_badparm_neg.py | 3 +++ tools/xm-test/tests/memset/03_memset_random_pos.py | 2 ++ tools/xm-test/tests/memset/04_memset_smallmem_pos.py | 3 +++ tools/xm-test/tests/migrate/01_migrate_localhost_pos.py | 3 +++ tools/xm-test/tests/network-attach/01_network_attach_pos.py | 3 +++ .../tests/network-attach/02_network_attach_detach_pos.py | 3 +++ .../network-attach/03_network_attach_detach_multiple_pos.py | 3 +++ tools/xm-test/tests/restore/01_restore_basic_pos.py | 3 +++ tools/xm-test/tests/restore/02_restore_badparm_neg.py | 3 +++ tools/xm-test/tests/restore/03_restore_badfilename_neg.py | 3 +++ tools/xm-test/tests/restore/04_restore_withdevices_pos.py | 3 +++ tools/xm-test/tests/save/01_save_basic_pos.py | 3 +++ tools/xm-test/tests/save/02_save_badparm_neg.py | 3 +++ tools/xm-test/tests/save/03_save_bogusfile_neg.py | 3 +++ tools/xm-test/tests/sysrq/01_sysrq_basic_neg.py | 3 +++ tools/xm-test/tests/sysrq/02_sysrq_sync_pos.py | 3 +++ tools/xm-test/tests/sysrq/03_sysrq_withreboot_pos.py | 3 +++ 40 files changed, 111 insertions(+), 3 deletions(-) diff --git a/tools/xm-test/tests/block-create/01_block_attach_device_pos.py b/tools/xm-test/tests/block-create/01_block_attach_device_pos.py index 1ea9bde00b..5c2febdad4 100644 --- a/tools/xm-test/tests/block-create/01_block_attach_device_pos.py +++ b/tools/xm-test/tests/block-create/01_block_attach_device_pos.py @@ -9,6 +9,8 @@ import time from XmTestLib import * +if ENABLE_VMX_SUPPORT: + SKIP("Block-attach not supported for VMX domains") # Create a domain (default XmTestDomain, with our ramdisk) domain = XmTestDomain() diff --git a/tools/xm-test/tests/block-create/02_block_attach_file_device_pos.py b/tools/xm-test/tests/block-create/02_block_attach_file_device_pos.py index 1d8323d7f0..36d64cc56e 100644 --- a/tools/xm-test/tests/block-create/02_block_attach_file_device_pos.py +++ b/tools/xm-test/tests/block-create/02_block_attach_file_device_pos.py @@ -9,6 +9,8 @@ import time from XmTestLib import * +if ENABLE_VMX_SUPPORT: + SKIP("Block-attach not supported for VMX domains") # Create a domain (default XmTestDomain, with our ramdisk) domain = XmTestDomain() diff --git a/tools/xm-test/tests/block-create/04_block_attach_device_repeatedly_pos.py b/tools/xm-test/tests/block-create/04_block_attach_device_repeatedly_pos.py index 63a79965af..d392c60427 100644 --- a/tools/xm-test/tests/block-create/04_block_attach_device_repeatedly_pos.py +++ b/tools/xm-test/tests/block-create/04_block_attach_device_repeatedly_pos.py @@ -9,6 +9,8 @@ import time from XmTestLib import * +if ENABLE_VMX_SUPPORT: + SKIP("Block-attach not supported for VMX domains") # Create a domain (default XmTestDomain, with our ramdisk) domain = XmTestDomain() diff --git a/tools/xm-test/tests/block-create/05_block_attach_and_dettach_device_repeatedly_pos.py b/tools/xm-test/tests/block-create/05_block_attach_and_dettach_device_repeatedly_pos.py index 47c808adb9..06cc116974 100644 --- a/tools/xm-test/tests/block-create/05_block_attach_and_dettach_device_repeatedly_pos.py +++ b/tools/xm-test/tests/block-create/05_block_attach_and_dettach_device_repeatedly_pos.py @@ -9,6 +9,8 @@ import time from XmTestLib import * +if ENABLE_VMX_SUPPORT: + SKIP("Block-attach not supported for VMX domains") # Create a domain (default XmTestDomain, with our ramdisk) domain = XmTestDomain() diff --git a/tools/xm-test/tests/block-create/06_block_attach_baddomain_neg.py b/tools/xm-test/tests/block-create/06_block_attach_baddomain_neg.py index 856b7c0f57..bd28bc18be 100644 --- a/tools/xm-test/tests/block-create/06_block_attach_baddomain_neg.py +++ b/tools/xm-test/tests/block-create/06_block_attach_baddomain_neg.py @@ -5,6 +5,9 @@ from XmTestLib import * +if ENABLE_VMX_SUPPORT: + SKIP("Block-attach not supported for VMX domains") + status, output = traceCommand("xm block-attach NOT-EXIST phy:ram1 sdb1 w") eyecatcher = "Error" diff --git a/tools/xm-test/tests/block-create/07_block_attach_baddevice_neg.py b/tools/xm-test/tests/block-create/07_block_attach_baddevice_neg.py index 0d388a5bac..8c08658068 100644 --- a/tools/xm-test/tests/block-create/07_block_attach_baddevice_neg.py +++ b/tools/xm-test/tests/block-create/07_block_attach_baddevice_neg.py @@ -9,6 +9,8 @@ import time from XmTestLib import * +if ENABLE_VMX_SUPPORT: + SKIP("Block-attach not supported for VMX domains") # Create a domain (default XmTestDomain, with our ramdisk) domain = XmTestDomain() diff --git a/tools/xm-test/tests/block-create/08_block_attach_bad_filedevice_neg.py b/tools/xm-test/tests/block-create/08_block_attach_bad_filedevice_neg.py index 2420fec3ba..e34f5c8ebd 100644 --- a/tools/xm-test/tests/block-create/08_block_attach_bad_filedevice_neg.py +++ b/tools/xm-test/tests/block-create/08_block_attach_bad_filedevice_neg.py @@ -9,6 +9,8 @@ import time from XmTestLib import * +if ENABLE_VMX_SUPPORT: + SKIP("Block-attach not supported for VMX domains") # Create a domain (default XmTestDomain, with our ramdisk) domain = XmTestDomain() diff --git a/tools/xm-test/tests/block-create/09_block_attach_and_dettach_device_check_data_pos.py b/tools/xm-test/tests/block-create/09_block_attach_and_dettach_device_check_data_pos.py index 0d782dd4c2..60b12da70e 100644 --- a/tools/xm-test/tests/block-create/09_block_attach_and_dettach_device_check_data_pos.py +++ b/tools/xm-test/tests/block-create/09_block_attach_and_dettach_device_check_data_pos.py @@ -9,6 +9,8 @@ import time from XmTestLib import * +if ENABLE_VMX_SUPPORT: + SKIP("Block-attach not supported for VMX domains") # Create a domain (default XmTestDomain, with our ramdisk) domain = XmTestDomain() diff --git a/tools/xm-test/tests/block-create/10_block_attach_dettach_multiple_devices.py b/tools/xm-test/tests/block-create/10_block_attach_dettach_multiple_devices.py index f32b6bee30..42fe9e5ebe 100644 --- a/tools/xm-test/tests/block-create/10_block_attach_dettach_multiple_devices.py +++ b/tools/xm-test/tests/block-create/10_block_attach_dettach_multiple_devices.py @@ -46,6 +46,9 @@ def dettach(devname): return 0, None +if ENABLE_VMX_SUPPORT: + SKIP("Block-attach not supported for VMX domains") + # Create a domain (default XmTestDomain, with our ramdisk) domain = XmTestDomain() diff --git a/tools/xm-test/tests/block-create/11_block_attach_shared_dom0.py b/tools/xm-test/tests/block-create/11_block_attach_shared_dom0.py index 4f897c3ead..adf7ca5ea5 100644 --- a/tools/xm-test/tests/block-create/11_block_attach_shared_dom0.py +++ b/tools/xm-test/tests/block-create/11_block_attach_shared_dom0.py @@ -5,6 +5,9 @@ from XmTestLib import * +if ENABLE_VMX_SUPPORT: + SKIP("Block-attach not supported for VMX domains") + # Mount /dev/ram0 s, o = traceCommand("mkfs /dev/ram0") diff --git a/tools/xm-test/tests/block-create/12_block_attach_shared_domU.py b/tools/xm-test/tests/block-create/12_block_attach_shared_domU.py index c93077fb4e..c0ce5bee8a 100644 --- a/tools/xm-test/tests/block-create/12_block_attach_shared_domU.py +++ b/tools/xm-test/tests/block-create/12_block_attach_shared_domU.py @@ -5,6 +5,9 @@ from XmTestLib import * +if ENABLE_VMX_SUPPORT: + SKIP("Block-attach not supported for VMX domains") + config = {"disk":"phy:/dev/ram0,hda1,w"} dom1 = XmTestDomain(extraConfig=config) diff --git a/tools/xm-test/tests/block-destroy/01_block-destroy_btblock_pos.py b/tools/xm-test/tests/block-destroy/01_block-destroy_btblock_pos.py index aa456cbdf2..8f7086388c 100644 --- a/tools/xm-test/tests/block-destroy/01_block-destroy_btblock_pos.py +++ b/tools/xm-test/tests/block-destroy/01_block-destroy_btblock_pos.py @@ -5,6 +5,9 @@ from XmTestLib import * +if ENABLE_VMX_SUPPORT: + SKIP("Block-detach not supported for VMX domains") + config = {"disk":"phy:/dev/ram0,hda1,w"} domain = XmTestDomain(extraConfig=config) diff --git a/tools/xm-test/tests/block-destroy/02_block-destroy_rtblock_pos.py b/tools/xm-test/tests/block-destroy/02_block-destroy_rtblock_pos.py index a56f985a8a..6c87db8198 100644 --- a/tools/xm-test/tests/block-destroy/02_block-destroy_rtblock_pos.py +++ b/tools/xm-test/tests/block-destroy/02_block-destroy_rtblock_pos.py @@ -5,6 +5,9 @@ from XmTestLib import * +if ENABLE_VMX_SUPPORT: + SKIP("Block-detach not supported for VMX domains") + domain = XmTestDomain() try: diff --git a/tools/xm-test/tests/block-destroy/04_block-destroy_nonattached_neg.py b/tools/xm-test/tests/block-destroy/04_block-destroy_nonattached_neg.py index db6c305592..4f1e485800 100644 --- a/tools/xm-test/tests/block-destroy/04_block-destroy_nonattached_neg.py +++ b/tools/xm-test/tests/block-destroy/04_block-destroy_nonattached_neg.py @@ -7,6 +7,9 @@ from XmTestLib import * +if ENABLE_VMX_SUPPORT: + SKIP("Block-detach not supported for VMX domains") + domain = XmTestDomain() try: diff --git a/tools/xm-test/tests/block-destroy/05_block-destroy_byname_pos.py b/tools/xm-test/tests/block-destroy/05_block-destroy_byname_pos.py index 78e84af1e7..2a0993f2a5 100644 --- a/tools/xm-test/tests/block-destroy/05_block-destroy_byname_pos.py +++ b/tools/xm-test/tests/block-destroy/05_block-destroy_byname_pos.py @@ -5,6 +5,9 @@ from XmTestLib import * +if ENABLE_VMX_SUPPORT: + SKIP("Block-detach not supported for VMX domains") + config = {"disk":"phy:/dev/ram0,hda1,w"} domain = XmTestDomain(extraConfig=config) diff --git a/tools/xm-test/tests/block-destroy/06_block-destroy_check_list_pos.py b/tools/xm-test/tests/block-destroy/06_block-destroy_check_list_pos.py index 4f0ff64479..bc41be984e 100644 --- a/tools/xm-test/tests/block-destroy/06_block-destroy_check_list_pos.py +++ b/tools/xm-test/tests/block-destroy/06_block-destroy_check_list_pos.py @@ -26,6 +26,9 @@ def checkXmLongList(domain): else: return False +if ENABLE_VMX_SUPPORT: + SKIP("Block-detach not supported for VMX domains") + domain = XmTestDomain() try: diff --git a/tools/xm-test/tests/block-list/01_block-list_pos.py b/tools/xm-test/tests/block-list/01_block-list_pos.py index dbe7415547..185eb66dc2 100644 --- a/tools/xm-test/tests/block-list/01_block-list_pos.py +++ b/tools/xm-test/tests/block-list/01_block-list_pos.py @@ -8,6 +8,9 @@ from XmTestLib import * +if ENABLE_VMX_SUPPORT: + SKIP("Block-list not supported for VMX domains") + config = {"disk":"phy:/dev/ram0,hda1,w"} domain = XmTestDomain(extraConfig=config) diff --git a/tools/xm-test/tests/block-list/02_block-list_attachbd_pos.py b/tools/xm-test/tests/block-list/02_block-list_attachbd_pos.py index 410dc8f23f..27e56e5083 100644 --- a/tools/xm-test/tests/block-list/02_block-list_attachbd_pos.py +++ b/tools/xm-test/tests/block-list/02_block-list_attachbd_pos.py @@ -8,6 +8,9 @@ from XmTestLib import * +if ENABLE_VMX_SUPPORT: + SKIP("Block-list not supported for VMX domains") + domain = XmTestDomain() try: diff --git a/tools/xm-test/tests/block-list/03_block-list_anotherbd_pos.py b/tools/xm-test/tests/block-list/03_block-list_anotherbd_pos.py index 442dd90113..f873d87025 100644 --- a/tools/xm-test/tests/block-list/03_block-list_anotherbd_pos.py +++ b/tools/xm-test/tests/block-list/03_block-list_anotherbd_pos.py @@ -8,6 +8,9 @@ from XmTestLib import * +if ENABLE_VMX_SUPPORT: + SKIP("Block-list not supported for VMX domains") + config = {"disk":"phy:/dev/ram0,hda1,w"} domain = XmTestDomain(extraConfig=config) diff --git a/tools/xm-test/tests/block-list/04_block-list_nodb_pos.py b/tools/xm-test/tests/block-list/04_block-list_nodb_pos.py index 4c2ce2a9ef..7ff1a2ddf7 100644 --- a/tools/xm-test/tests/block-list/04_block-list_nodb_pos.py +++ b/tools/xm-test/tests/block-list/04_block-list_nodb_pos.py @@ -8,6 +8,9 @@ from XmTestLib import * +if ENABLE_VMX_SUPPORT: + SKIP("Block-list not supported for VMX domains") + domain = XmTestDomain() try: @@ -21,8 +24,5 @@ status, output = traceCommand("xm block-list %s" % domain.getId()) if status != 0: FAIL("xm block-list returned bad status, expected 0, status is %i" % status) -if ENABLE_VMX_SUPPORT: - SKIP("Using block device for root, so this case does not apply") - if output != "": FAIL("xm block-list should not list anything for domain with no block devices") diff --git a/tools/xm-test/tests/block-list/06_block-list_checkremove_pos.py b/tools/xm-test/tests/block-list/06_block-list_checkremove_pos.py index ccaf0d72cc..e342262659 100644 --- a/tools/xm-test/tests/block-list/06_block-list_checkremove_pos.py +++ b/tools/xm-test/tests/block-list/06_block-list_checkremove_pos.py @@ -5,6 +5,9 @@ from XmTestLib import * +if ENABLE_VMX_SUPPORT: + SKIP("Block-list not supported for VMX domains") + domain = XmTestDomain() try: diff --git a/tools/xm-test/tests/memmax/01_memmax_badparm_neg.py b/tools/xm-test/tests/memmax/01_memmax_badparm_neg.py index b8f2a28234..e13fca8415 100644 --- a/tools/xm-test/tests/memmax/01_memmax_badparm_neg.py +++ b/tools/xm-test/tests/memmax/01_memmax_badparm_neg.py @@ -8,6 +8,8 @@ import re from XmTestLib import * +if ENABLE_VMX_SUPPORT: + SKIP("Mem-max not supported for VMX domains") status, output = traceCommand("xm mem-max") eyecatcher = "Error:" diff --git a/tools/xm-test/tests/memset/01_memset_basic_pos.py b/tools/xm-test/tests/memset/01_memset_basic_pos.py index a5744704b0..5ed6406e8d 100644 --- a/tools/xm-test/tests/memset/01_memset_basic_pos.py +++ b/tools/xm-test/tests/memset/01_memset_basic_pos.py @@ -20,6 +20,9 @@ import re import time from XmTestLib import * +if ENABLE_VMX_SUPPORT: + SKIP("Mem-set not supported for VMX domains") + # Create a domain (default XmTestDomain, with our ramdisk) domain = XmTestDomain() diff --git a/tools/xm-test/tests/memset/02_memset_badparm_neg.py b/tools/xm-test/tests/memset/02_memset_badparm_neg.py index 07f7e2c635..a2f60c86d2 100644 --- a/tools/xm-test/tests/memset/02_memset_badparm_neg.py +++ b/tools/xm-test/tests/memset/02_memset_badparm_neg.py @@ -18,6 +18,9 @@ import re from XmTestLib import * +if ENABLE_VMX_SUPPORT: + SKIP("Mem-set not supported for VMX domains") + # destroy no parm input - negative test status, output = traceCommand("xm mem-set") eyecatcher = "Error:" diff --git a/tools/xm-test/tests/memset/03_memset_random_pos.py b/tools/xm-test/tests/memset/03_memset_random_pos.py index 1f5c033710..c4f3c47370 100644 --- a/tools/xm-test/tests/memset/03_memset_random_pos.py +++ b/tools/xm-test/tests/memset/03_memset_random_pos.py @@ -8,6 +8,8 @@ import re from XmTestLib import * +if ENABLE_VMX_SUPPORT: + SKIP("Mem-set not supported for VMX domains") domain = XmTestDomain() diff --git a/tools/xm-test/tests/memset/04_memset_smallmem_pos.py b/tools/xm-test/tests/memset/04_memset_smallmem_pos.py index 11816d14ba..d06571bd05 100644 --- a/tools/xm-test/tests/memset/04_memset_smallmem_pos.py +++ b/tools/xm-test/tests/memset/04_memset_smallmem_pos.py @@ -5,6 +5,9 @@ from XmTestLib import * +if ENABLE_VMX_SUPPORT: + SKIP("Mem-set not supported for VMX domains") + domain = XmTestDomain() try: diff --git a/tools/xm-test/tests/migrate/01_migrate_localhost_pos.py b/tools/xm-test/tests/migrate/01_migrate_localhost_pos.py index 4895e9c719..8f86bdd128 100644 --- a/tools/xm-test/tests/migrate/01_migrate_localhost_pos.py +++ b/tools/xm-test/tests/migrate/01_migrate_localhost_pos.py @@ -17,6 +17,9 @@ import commands from XmTestLib import * +if ENABLE_VMX_SUPPORT: + SKIP("Migrate currently not supported for VMX domains") + # Create a domain (default XmTestDomain, with our ramdisk) domain = XmTestDomain() diff --git a/tools/xm-test/tests/network-attach/01_network_attach_pos.py b/tools/xm-test/tests/network-attach/01_network_attach_pos.py index b2a491b4e2..eb692ab876 100644 --- a/tools/xm-test/tests/network-attach/01_network_attach_pos.py +++ b/tools/xm-test/tests/network-attach/01_network_attach_pos.py @@ -8,6 +8,9 @@ import sys from XmTestLib import * from network_utils import * +if ENABLE_VMX_SUPPORT: + SKIP("Network-attach not supported for VMX domains") + # Create a domain (default XmTestDomain, with our ramdisk) domain = XmTestDomain() diff --git a/tools/xm-test/tests/network-attach/02_network_attach_detach_pos.py b/tools/xm-test/tests/network-attach/02_network_attach_detach_pos.py index 7e4559a12f..08563eb239 100644 --- a/tools/xm-test/tests/network-attach/02_network_attach_detach_pos.py +++ b/tools/xm-test/tests/network-attach/02_network_attach_detach_pos.py @@ -10,6 +10,9 @@ import time from XmTestLib import * from network_utils import * +if ENABLE_VMX_SUPPORT: + SKIP("Network-attach not supported for VMX domains") + # Create a domain (default XmTestDomain, with our ramdisk) domain = XmTestDomain() diff --git a/tools/xm-test/tests/network-attach/03_network_attach_detach_multiple_pos.py b/tools/xm-test/tests/network-attach/03_network_attach_detach_multiple_pos.py index 1b00b32e41..d169119d2c 100644 --- a/tools/xm-test/tests/network-attach/03_network_attach_detach_multiple_pos.py +++ b/tools/xm-test/tests/network-attach/03_network_attach_detach_multiple_pos.py @@ -10,6 +10,9 @@ import time from XmTestLib import * from network_utils import * +if ENABLE_VMX_SUPPORT: + SKIP("Network-attach not supported for VMX domains") + # Create a domain (default XmTestDomain, with our ramdisk) domain = XmTestDomain() diff --git a/tools/xm-test/tests/restore/01_restore_basic_pos.py b/tools/xm-test/tests/restore/01_restore_basic_pos.py index 8254148525..34c93e8cf8 100644 --- a/tools/xm-test/tests/restore/01_restore_basic_pos.py +++ b/tools/xm-test/tests/restore/01_restore_basic_pos.py @@ -12,6 +12,9 @@ import time from XmTestLib import * +if ENABLE_VMX_SUPPORT: + SKIP("Restore currently not supported for VMX domains") + domain = XmTestDomain() try: diff --git a/tools/xm-test/tests/restore/02_restore_badparm_neg.py b/tools/xm-test/tests/restore/02_restore_badparm_neg.py index aee5b5da72..c66ed79113 100644 --- a/tools/xm-test/tests/restore/02_restore_badparm_neg.py +++ b/tools/xm-test/tests/restore/02_restore_badparm_neg.py @@ -12,6 +12,9 @@ import re from XmTestLib import * +if ENABLE_VMX_SUPPORT: + SKIP("Restore currently not supported for VMX domains") + status, output = traceCommand("xm restore -x") eyecatcher1 = "Error:" eyecatcher2 = "Traceback" diff --git a/tools/xm-test/tests/restore/03_restore_badfilename_neg.py b/tools/xm-test/tests/restore/03_restore_badfilename_neg.py index 7639c4b90e..ba6e7e2f30 100644 --- a/tools/xm-test/tests/restore/03_restore_badfilename_neg.py +++ b/tools/xm-test/tests/restore/03_restore_badfilename_neg.py @@ -12,6 +12,9 @@ import re from XmTestLib import * +if ENABLE_VMX_SUPPORT: + SKIP("Restore currently not supported for VMX domains") + status, output = traceCommand("xm restore /tmp/NON_EXIST") eyecatcher1 = "Error:" eyecatcher2 = "Traceback" diff --git a/tools/xm-test/tests/restore/04_restore_withdevices_pos.py b/tools/xm-test/tests/restore/04_restore_withdevices_pos.py index 61e0b3ed81..74c6145c03 100644 --- a/tools/xm-test/tests/restore/04_restore_withdevices_pos.py +++ b/tools/xm-test/tests/restore/04_restore_withdevices_pos.py @@ -7,6 +7,9 @@ from XmTestLib import * import re +if ENABLE_VMX_SUPPORT: + SKIP("Restore currently not supported for VMX domains") + config = {"disk": ["phy:/dev/ram0,hda1,w", "phy:/dev/ram1,hdb2,w"], "vif": ['', '']} domain = XmTestDomain(extraConfig=config) diff --git a/tools/xm-test/tests/save/01_save_basic_pos.py b/tools/xm-test/tests/save/01_save_basic_pos.py index e76b7e61d7..27e68a5deb 100644 --- a/tools/xm-test/tests/save/01_save_basic_pos.py +++ b/tools/xm-test/tests/save/01_save_basic_pos.py @@ -7,6 +7,9 @@ import time from XmTestLib import * +if ENABLE_VMX_SUPPORT: + SKIP("Save currently not supported for VMX domains") + domain = XmTestDomain() try: diff --git a/tools/xm-test/tests/save/02_save_badparm_neg.py b/tools/xm-test/tests/save/02_save_badparm_neg.py index 7966ff1ee1..c50dbe9013 100644 --- a/tools/xm-test/tests/save/02_save_badparm_neg.py +++ b/tools/xm-test/tests/save/02_save_badparm_neg.py @@ -12,6 +12,9 @@ import re from XmTestLib import * +if ENABLE_VMX_SUPPORT: + SKIP("Save currently not supported for VMX domains") + status, output = traceCommand("xm save -x") eyecatcher1 = "Error:" eyecatcher2 = "Traceback" diff --git a/tools/xm-test/tests/save/03_save_bogusfile_neg.py b/tools/xm-test/tests/save/03_save_bogusfile_neg.py index de66e6080f..0115ee5f3b 100644 --- a/tools/xm-test/tests/save/03_save_bogusfile_neg.py +++ b/tools/xm-test/tests/save/03_save_bogusfile_neg.py @@ -10,6 +10,9 @@ import time from XmTestLib import * +if ENABLE_VMX_SUPPORT: + SKIP("Save currently not supported for VMX domains") + domain = XmTestDomain() try: diff --git a/tools/xm-test/tests/sysrq/01_sysrq_basic_neg.py b/tools/xm-test/tests/sysrq/01_sysrq_basic_neg.py index 00eee82715..9d213e944a 100644 --- a/tools/xm-test/tests/sysrq/01_sysrq_basic_neg.py +++ b/tools/xm-test/tests/sysrq/01_sysrq_basic_neg.py @@ -9,6 +9,9 @@ import re from XmTestLib import * +if ENABLE_VMX_SUPPORT: + SKIP("Sysrq not supported for VMX domains") + status, output = traceCommand("xm sysrq does_not_exist s"); if status == 0: diff --git a/tools/xm-test/tests/sysrq/02_sysrq_sync_pos.py b/tools/xm-test/tests/sysrq/02_sysrq_sync_pos.py index 061e7ac006..0b805fd7b6 100644 --- a/tools/xm-test/tests/sysrq/02_sysrq_sync_pos.py +++ b/tools/xm-test/tests/sysrq/02_sysrq_sync_pos.py @@ -9,6 +9,9 @@ import time from XmTestLib import * +if ENABLE_VMX_SUPPORT: + SKIP("Sysrq not supported for VMX domains") + # Create a domain (default XmTestDomain, with our ramdisk) domain = XmTestDomain() diff --git a/tools/xm-test/tests/sysrq/03_sysrq_withreboot_pos.py b/tools/xm-test/tests/sysrq/03_sysrq_withreboot_pos.py index 5eef099a74..b69e5617b0 100644 --- a/tools/xm-test/tests/sysrq/03_sysrq_withreboot_pos.py +++ b/tools/xm-test/tests/sysrq/03_sysrq_withreboot_pos.py @@ -7,6 +7,9 @@ from XmTestLib import * import time +if ENABLE_VMX_SUPPORT: + SKIP("Sysrq not supported for VMX domains") + domain = XmTestDomain() try: -- 2.30.2